dee89ccd14c86562be721459072ac5258df954d5,opennms-webapp/src/main/java/org/opennms/web/alarm/JdbcWebAlarmRepository.java,AlarmMapper,mapRow,#ResultSet#number#,133
Before Change
alarm.count = rs.getInt("counter");
alarm.severity = OnmsSeverity.get(rs.getInt("severity"));
alarm.lastEventID = rs.getInt("lastEventID");
alarm.firsteventtime = new Date(rs.getTimestamp("firsteventtime").getTime());
alarm.lasteventtime = new Date(rs.getTimestamp("lasteventtime").getTime());
alarm.description = rs.getString("description");
alarm.logMessage = rs.getString("logmsg");
alarm.operatorInstruction = rs.getString("OperInstruct");
alarm.troubleTicket = rs.getString("TTicketID");
Integer stateCode = (Integer) rs.getObject("TTicketState");
for (TroubleTicketState state : TroubleTicketState.values()) {
if (stateCode != null && state.ordinal() == stateCode.intValue()) {
alarm.troubleTicketState = state;
}
}
alarm.mouseOverText = rs.getString("MouseOverText");
alarm.suppressedUntil = new Date(rs.getTimestamp("suppressedUntil").getTime());
alarm.suppressedUser = rs.getString("suppressedUser");
alarm.suppressedTime = new Date(rs.getTimestamp("suppressedTime").getTime());
alarm.acknowledgeUser = rs.getString("alarmAckUser");
Timestamp alarmAckTime = rs.getTimestamp("alarmAckTime");
if (alarmAckTime != null) {
alarm.acknowledgeTime = new Date(alarmAckTime.getTime());
}
alarm.nodeLabel = rs.getString("nodeLabel");
After Change
}
private static class AlarmMapper implements ParameterizedRowMapper<Alarm> {
public Alarm mapRow(ResultSet rs, int rowNum) throws SQLException {
Alarm alarm = new Alarm();
alarm.id = rs.getInt("alarmID");
alarm.uei = rs.getString("eventUei");
alarm.dpName = rs.getString("dpName");
// node id can be null, in which case nodeID will be 0
alarm.nodeID = new Integer(rs.getInt("nodeID"));
alarm.ipAddr = rs.getString("ipAddr");
// This causes serviceID to be null if the column in the database is null
alarm.serviceID = ((Integer) rs.getObject("serviceID"));
alarm.reductionKey = rs.getString("reductionKey");
alarm.count = rs.getInt("counter");
alarm.severity = OnmsSeverity.get(rs.getInt("severity"));
alarm.lastEventID = rs.getInt("lastEventID");
alarm.firsteventtime = getTimestamp("firsteventtime", rs);
alarm.lasteventtime = getTimestamp("lasteventtime", rs);
alarm.description = rs.getString("description");
alarm.logMessage = rs.getString("logmsg");
alarm.operatorInstruction = rs.getString("OperInstruct");
alarm.troubleTicket = rs.getString("TTicketID");
Integer stateCode = (Integer) rs.getObject("TTicketState");
for (TroubleTicketState state : TroubleTicketState.values()) {
if (stateCode != null && state.ordinal() == stateCode.intValue()) {
alarm.troubleTicketState = state;
}
}
alarm.mouseOverText = rs.getString("MouseOverText");
alarm.suppressedUntil = getTimestamp("suppressedUntil", rs);
alarm.suppressedUser = rs.getString("suppressedUser");
alarm.suppressedTime = getTimestamp("suppressedTime", rs);
alarm.acknowledgeUser = rs.getString("alarmAckUser");
alarm.acknowledgeTime = getTimestamp("alarmAckTime", rs);
alarm.nodeLabel = rs.getString("nodeLabel");
alarm.serviceName = rs.getString("serviceName");